From 2a29ec5176d30e1c83e8b506c795181955e61159 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 26 Apr 2007 05:54:21 +0000 Subject: [PATCH] Accept unnamed separators. (#369112, Christian Persch) 2007-04-26 Matthias Clasen * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept unnamed separators. (#369112, Christian Persch) svn path=/trunk/; revision=17649 --- ChangeLog | 5 +++++ gtk/gtkuimanager.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ead4d45fe2..bd50b7c7bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-26 Matthias Clasen + + * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept + unnamed separators. (#369112, Christian Persch) + 2007-04-26 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accel_group_finalize): Don't access diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 041adad374..529c296035 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1609,7 +1609,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self, g_return_if_fail (GTK_IS_UI_MANAGER (self)); g_return_if_fail (merge_id > 0); - g_return_if_fail (name != NULL); + g_return_if_fail (name != NULL || type == GTK_UI_MANAGER_SEPARATOR); node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE); sibling = NULL; @@ -1710,7 +1710,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self, } child = get_child_node (self, node, sibling, - name, strlen (name), + name, name ? strlen (name) : 0, node_type, TRUE, top); if (action != NULL) -- 2.30.2